routing - adjusted framework to use better routing.