1.0 version. Improve code.