removed conditional before