Made structural changes