Major infrastructure reworking