Minor changes to match evaluation process