Moved rules around to accomdate processing logic