Not sure what these changes are doing in this PR?