reorganised update serialising to be less racy...