Made large structural changes