- Added some other functions