Adjusted to use object s already present rather than just strings (option is avaiable for either).