Final_version_improve_17