FIXING ALL THE THINGS