added time tracking