nearly all changes made