After major rework of data flow in private repo