Move update call down