work on update to new structure