Added new rules based on state mode