Improved tasks and scaffold