better events

Change-Id: Idf56457d2517d02739590609cb82282ed7465ed9