I broke things by trying to make them better :'(