Add locations, reformat output