More modifications to follow the single-pass approach