re-do v1.1 changes post publish v1