sams latest changes
merge conflicts resolved