Yes making the epic buff also effect spells wouldn't be hard to change i wouldn't imagine and taking into account the reset would go along way to making Swashys desired somewhat, do it do it NOW! or at least do something.