Align with SNAP