VRF adapted to demo. Other modifications