changed and added some things, nothing should really have changed