more structural updates