More announcement fiddling