8 Commits (feature/optimized-matrix)