Fixed the numbering, finally.  Now rmoving HKG and SYD because they currently don't fit with my suggestion to use performance flavors