very little changes
Continued development of tracers, not yet finished