some of Simon's changes... the good ones...