changed to add firstname and lastname