Updated code to work with the new kvf.fo