deleted stuff
 changed stuff