update Changes with last two PRs