vf-metadata3

This should address  comments in #714.