Do we need to be making these changes at the same time? Can we deal with these in a separate PR?