moving tic and toc
subquery for time
Merge branch 'dev'