Added missing conditions