giant commit from the weekend