Work on optional software install
Small tweak