added Phase 2 feature set