Update For Part 2 By Peng