Spring 2017 :: EDITS - jwkpec