Fixed Upstream data-flow, Remove simple Par; Add ParGrid