Made some changes as per the email exchange with Rob.