Updated to not call task within a task