Add the update function and tidy names