More work on twin-update