Inquisition-update

closes #196