code change to use different passing objects.
merge conflict