Sorted out per-gp data for distribution again