added necessary template changes