Samet's lab0 commit