updating with latest versions of code that was missed during initial setup.