adapted proposal to template