Final_version_improve_19