Final_version_improve_21