investigative code changes
merge with origin/master