even more changes