Updated Trip-Calculator