Final_version_improve_02