saved minor branch changes so that I can merge w/ hetland