Mod 17 Consolodation

Modified