added other conditional for presentation