Anewbranch

units updates and tracer removal