better XID creation
...