Addressed concerns for PR 311