updated and streamlined the setup trip