Added some more functions