Finish V1 of Part 2