Undo fix and actually use a macro in the accumulation test .. just incase.