added java6 and java7