added city class and new pricing system