### What problem does this PR solve? ### Type of change - [x] Performance Improvement - [ ] Other (please describe):