Product Flow Change

Added support for data in products
see notes in code