changed the way update is handled