template and functionality updates