Added some useful code