adding revised parse & plot functions