Update  8

Update to handle better timing.