Cleaning up the arrangement to see the 24,5,3.3 flow