commiting Ben's changes upstream