made ALL THE CHANGES