Both in and out of water. X-Man or Avenger?