Some changes to init & update