Broke everything to fix it better