Added conditional completion/ deletion