Made loading more efficient