Upgraded parametric scan