migrated to java 6