Refactored to less.