Updated to interpret new rules format