~# changes on the routing and rest view