Modified updates
more cleanup