lots more changes