-improve swapping behavior