Updated from wikipedia tables