initial commit of changes for my internal use on ubuntu