Simplifying and fixing up rules and finish soon