[Refactoring] Lowered the bar.