FBI Director Christopher Wray continues to shake up his top staff, this time appointing Dana Boente to take over as general counsel.

According to a Justice Department official, Boente has been selected to be the FBI’s next general counsel to replace James Baker, who was reassigned in late 2017.

Boente is still the U.S. attorney in the Eastern District of Virginia and the acting head of the Justice Department’s national security division.

At one point, Boente was acting attorney general after Sally Yates was fired and was also acting deputy attorney general before the appointment and confirmation of Rod Rosenstein.

The 33-year-old veteran of the Justice Department announced his resignation as U.S. attorney overseeing in the Eastern District of Virginia in October, though he made it clear that this would only become effective when his successor, John Demers, was confirmed.

The Eastern District of Virginia is home to the CIA and the Pentagon, and often oversees high-profile terrorism cases.

Earlier Tuesday it was announced the current FBI chief of staff, James Rybicki — a holdover from the James Comey-era — told Wray he was leaving for the private sector.