Made all plots vs. r instead.