and yet more changes