ALways try to make swap working