changed logic of task templating