:muscle: improved swapping behavior