Refine the functions.

Finalize the version 1.0