Update Module2b

Bring Module2b up to speed with changes from Rev_Mod_1_and_2