Updates due to review