REWORKED THIS FUCKING SHIT ONCE AGAIN
Fixed what others broke