Changes to use list so plots will work.