updates to work on TSO