Adding some new stuff...