@trivial Moved some rules