Yes, Jonathan Herrera has returned from his hamstring injury and immediately joins the starting lineup at shortstop. Though I think some would argue there are two better defensive shortstops in the lineup with him tonight playing two other positions. D.J. LeMahieu was optioned back to Colorado Springs to make room.