wip better distribution
implemented proposed distribution from pj