new template is complete for 35%
merged