Replaced all route calls