Renamed add-rule and changed the order they are added