Added compound conditionals using and/ or