Changes as per Karen's suggestion.

Signed-off-by: Jacob <jacob@zhservices.com>