adds time calculation
Merge branch 'collison-detector'