FIXING SOME SHIT ?