improved 7-rule handling