Updated template and content