Added some additional functions