Adding all the new stuff