Updated with ggplot2 figures