updating to fit jdk 1.6