more swapping to yadr