making checking tables smarter after removing the m_wh uses