change swap -> move