Revert "Revert "phase 1 check 2 again""

This reverts commit 131d65a19b35f47fb26a5d00b2f9fa772e603fc8.