Added some new small functions