move upgrade topic, fewer upgrade topics