Fixed Battle(hopefully)