Change structure to work more seamlessly