tweaked: don't use metadata by default - further testing required.