commit from chai's mac