separated rules from main, fixed issues #1 and #2