Updated code to complete task id