revert back to the version on master but add in my string constants