upgraded jetty (now the puking starts)