preparing for install and update scripts
merging with yesterdays changes