Moved super.update() to bottom