Fixed the whole thing