Final commit of from template version2