fixing alllllll the problems :D