removed some of the import overhead