changed some things back to how they were