more work on core templates