swapping works now