Persistence:
*support hyperbolic and parabolic roi
*clean up code