Changed class &  made cities