Added some more rules, up to 6.2