fixes for the new structure