Use new events sytem.