About to start revisions from Langlois comments #2