refactoring while I try to make sense of the hsc interface