added lastname
merged our work into 1