Updated rules, and now using tags for each screen