merging in final script and yml changes I have

merging in final script and yml changes I have