See updates on construction below