changed for Tomcat