removed flushing, making it more compatible with watchers