first integrated commit from Ken and Sam