Update to Pre2 and java 1.6

Update to Pre2 and java 1.6