cleaned up dispel code ...