updated to use JDK 1.7