rules and control fixed, new version