Added Chandrayee's new plotting code