Addressed comments for PR 894