update according to last jpc changes