fixing the shit out of it