Added comments and posts to trip
resolved merge conflicts