enhanced import
bug fixes