made most of the changes