fixed imports, added class