removed all update() calls