fixing setup to support new upp