Updating main branch

Creating a pull request for commenting ability
I think this method could be clearer? at least the last return true feels odd