minor changes
update according to last jpc changes