Working on battle end