update and fixed City_Maker