fixing templates
fixing templates