Updated manialive (r536)