Almost done with policy switching