Updated tmeplate