template updates to 3.x