Merge pull request #48 from TheBlueMatt/2023-07-further-opt