[trevius]

I already edited the changes you suggested into the code post above. I will test it out later and verify that it all works as intended. Lemme know if you see anything wrong still with the code above.