Advanced forward fold

Regressions