Addressed comments for PR 902