Improvements to version 3.0.3.6