merge Ben and Robin changes