added names to locations and segments