changes for driving templates