Update with stuff from Wizerati (improved routing)