make flow better