Added timers
JavaDoc added