Adding some more new stuff