CaTSA generation

Improve CaTSA generation on local machine