changed vrf handling