Refactored large