Commit 2 for Machismo