and more changes