Final_version_improve_13