Version 2 edits and minor change to WV import