before clean up
v1.0.2