ADD: Support aligning on each individual frame