changes as reviewer requested