Updated plotting design