Changes to templete to make it more of a starting point