Added Kulju's time tracking