yet more changes