Bringing over changes I had in a separate repository on the format_change branch