Finish part 2 and modify part 1 according to requirement in pdf