This commit broke things just b4 my grading mtg.

Revert "Enhancement 3"

This reverts commit b934e3107d879e9cbb6ae1d5672102f0f904f09d.