Changed to use java 6