main -> snapping_fixes