Not sure why these changes are being made...