fix to work with new structure