Fixed Jim Thatcher and added location