Added amend feature