Attempt at first city, other changes