Second attempt to add template