refactoring and retesting regression.