Modified 5c, 6t, added us_map