merge JJ's tomcat work