Mclaren edit (updated version)