some minor changes, but import still buggy