revamp over to new virl_core states