Change SWAP to Paperdreamer as well