addressed comments on PR