more changes from author