Use the brand new internal template