Improved the rules a bit