Added some more goodies...