Revisions addressed #331