modified some rules