minor changes
finished update method (unrefactored)