merged in Roger's changes