Final_version_improve_20