Updated the generic rules to mix the new and old ones. Found some missing language and thought it was incomplete.