Refactored. Added saveCurrentRoute