added an import, removed extras