Updates from Inscopix (Lane's changes)