Updated timings
Merge branch 'develop'