refactor to reflux\