JC changes to tpl