Better logging
Swap passes back target element