Remove time
More safety on scaling
Trace