I broke it, and then made it better