jh - merged Kenneth's updates