Took latest templates from working code.