final commit part 1