Updated with logged in first name and last name