Routing stuff fixed
fixing merge conflics