did some more routing
updated changes