Just trying to fix what's broke