And some more changes...