Change provider for noe to use flushing, made type more like original