major re-write of ModifiedBounceForMinuit