Redesign: fix vmq