saving changes that were suggested by Shaun for pull request, not all done yet