Broke it, but now it works