WIP: transaction changes