most of the changes already made