Updated data and display flows