adding cell swap to avatar move method