Updated plotting scripts