2 Commits (substring-optimizations)