Updated for nearly-there plots