Suggestions for 9.7 - added 'flow' information at end