Added completed and duplicate behaviour