Yeah that makes the most sense. Battles will stay. The storyline will change because it wouldn't make sense not to.