removed name, added firstname/lastname