Update plotting and modeling