Updated the Interrogator stuff