Added swap questions