Made a few changes again