formatting and flow updates