cleaned up rules