ButterCup Commit 2