backed out of the previous commit; using strings instead of objects for the options