fix according to new structure