fixed initial commit v2