last changes for v4.0.1