a few more structural changes