Changes after mods to template
More commits
Commit message