Added timing detection to Tufvesson