changed from java1.6 to 1.7