update to handle new subjet structure