Fixed data getting carried over. Simplified routing