Rules checking methods reworked again