updated to new structure