v1.21 content tweak