Now with conditional logic