cementing post transaction refactor