Flare was in the demo and yeah, I find it easier to keep track of all the spells.