Commiting Phase 4 changes on 4/23/2014