trip update front end works
merged