Made some others things working