add conditional for the conditions