updated for new structure