Improve rules