modified to tomcat7