3rd commit - Added more functions