I canI think after these changes the order gets `update!` more than once