more refactory to more speed, version 0.1.0