2 Commits (performance-improvements)