Added smart check to Phase 3
Merge conflicts