Integrate with new flow app, Fixed units display,