even more topic 4 changes