more changed to template