Updated for relative imports, + bug