Added some function...