Scripts: Updated plotting