Fixed all the shit