added guard
Swapping macs