* 2nd commit by bmr from IJ 12