Redid the rules to make it easier to apply different rules to different users