merge in kberg's changes