Ninja commit. I need these changes at work in the morning.