fixed final import issues for initial feature