Added changes after talking to Humphrey.