Swapped out lazy load for something simpler