Optimize commit 2