Final_version_improve_08