FIXING THINGS!!!!!