Revert "revised toDoAdd tpl"

This reverts commit 8b04072b57ce55950ba83b87ccb308b0ab37b31a.
Revert "Revert "revised toDoAdd tpl""

This reverts commit e13bc2cbb69f70099a472f1aca2cd2b6e15da09c.