Switching to proposed boilerplate changes