refactoring, expansion of ROI is now safe