End of implement new version 6.0.2 18865