Testing updating
More packaging tweaks