v0.3.2. Improvement