+ more structural changes to the engine