vcf, ui stuff somehow uncommitted from last week ?