Updated for plots