Really added key stuff (and others things)