amend and remove return if changed