Switch back to AggregateFrames in separate step (for speed)