importing fixups