Version 0.0.0012

Change the construction into the elegent way