finish step 1 and 2.

still need to make the package to be completed