Change to my tpl implementation