[XS] Change in pysim[master]: WIP