working version - changing rooutes