Trying to fix what I broke