Update 3.1-3.4 Phase 1