merge Ben's changes