Update to match evaluation