Final_version_improve_22