Back to 1.7 java
Updating code to 1.7