Changes from author
Changes from author