renamed message and added event/new