Used an event to do the route redirect
Merging in binary conflicts