FIXING ALL THE PROBLEMS