Proposed changes

Issue Number: close #xxx