adjust to the new events