Intermediate commit: Switching to task based