changed from jdk1.6 to 1.7