#11

made changes in templates