changed rules to confirm to new grammar