Changing to Java1.6