Event Plotting Fixed