import working but still needs improvement