revised import to actually work