l2 and l3 tpl changes