merging trip branch into staging after Brian reviewed