Tweaked vanish class a bit. Should work better now.