initial commit fixed version