still more changes