Phase 1 of rewrite the better way