Converted to use velocity instead of JSP