conditional & nested conditional added