updates in support of v1.2