Updated this whole thing