Second commit - Added functionality