Event manager changes