Yes, I Changed It Again

And surely something will break and somebody will whine. Wah.