Switching to use single-pass flag instead of interval