some changes made for java 1.6