Incorporated code to support new WEB Interface