Improved task generation
Improved task generation