Separated update from init