Changes to structrue