Added revisions from Mark Wilson.