Updating main branch

Creating a pull request for commenting ability
I'm not sure it's worth lazy initialization in this case.