Phase 1 Tweaks for ES