Final_version_improve_01