added extensive plotting