Modified logic for date and added logic for fullname