added some more goodies