added location & gerry's edit