Finish Version2 according to the new requirements