New plotting

Does not work, need to go back to older version