refactors the 1-step button
Merge branch 'flushing-date'