Better conditional logic