improve flow (some more)