Incorporate C.D. Langevin suggestions