Gentle reworking of installtaion process.