Merge with Rowel Ventura's checkpoint