Updating per Jerry's requests