add swaps; hook in