INPC TODOs added