adapted to new structure