updates for java 7
updates for java 7