Scotts branch

merge changes from scott achine