Updating to take into account new structure of wisp.