removed conditional method