Updated template, left content templatised for all