Tweaking task creation/completion logic