2nd commit - Added a few functions