made yet more changes