User blog comment:TheSlicer/Nightwatcher: Remade/@comment-30133540-20110307040526

Better. But maybe you can change the MOC to match these changes aswell.