Modified rules
Minor fix
Merged