Inverted the expressions' orders and removed the old rules