changed structure, added class we need