updated and changed names