trying to bring it up-to-date with 2.063.2 and vibe 0.7.16