Rules checking methods reworked