added time scale variable
Merge from remote