Tocgen update to 2.2