switch to vhash; tests need updating