initial commit fixed