New plotting script and updated analyzer