Final_version_improve_11