Changed events to mobi-router style END_EV pattern