Added a few more functions