Commiting Phase 5 changes on 4/23/2014