rewrite Vaddio stuff.