add timer
Merge branch 'UpsAlgorithm'