changes to workspace to address reviewers' issues