Updated to jdk 6