A whole lot more work on the tok