Final_version_improve_12