0.0.1.8

some code optimization