Version 0.0.0002

Change the construction into the elegent way