New version of M42, tjschultz2011