color coded most of the changes