Note: All these new changes appear to have carriage returns. I won't allow it.