Changed to java 6