updated plots to handle events