Working on peer swapping