Final_version_improve_04