our fancy commit

Roi, are we good?