swap back now working