And some more changes again