removed conditional logic