Commit - 2
Add more functions