final commit part 2