restructuring for new analysis