Refactored implementation.