part 1 of current commit