Update software installation code (final)