Added some goodies