Added lazy loading back in.