Stream setup upgrades

I will use these items to upgrade my setup.