some INPC improvments