Adding exit conditions