Added more names and locations