changed mostly routing and some config