Final_version_improve_16