modify templates and there are some issues