Changes and fix attempts. I'M SUCH A FAILURE