changed avatar layering and added case if no city-state is provided