evaluation hopefully done

didn't touch the discussion part