add extra scenario
more haps
1) Replace integral with hypergeometric function, 2) Embarassing speedup fix