Modified plotting functions