jdk

5102dade - Tweeks to make the basic case work