Made some other changes again