Are these changes needed for the PR?