router logic changes