Added Roger's changes