Changes in grapher with latest functionality