+ @mnandri - adding more fields to investigator