fixing to match new changes to general-refactoring