more work on the new template