Small changes to main rules