Added a couple more goodies