Final commit of part 2