Made changes per WestLangley