Improvements to version 3.0.2.9