Update #18

Changes for Citys and Header