some code updates for latest task defs