Adapted VFI to the model/solution separation.