new version with holes in all the right places