adjustment to refactored data-structure