added non-live mode