Changed update messages to occur before update.