Updated overall structure