Added derivatives, modified JSP