updated to include the latest PRs