merge Keith's changes