Final_version_improve_10