Final_version_improve_07