Added changes outlined in email and compiled