Necessary changes from Jennifer

essential, totally important stuff