* Swap location/role, part II