added router partial, etc.