updated to use new structure