Revert to previous refactoring, Updated w/DistCol