Final_version_improve_09