Modifications so we don't spam events